dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1ddd7d9 14edc16)

author	Chong Yidong <cyd@stupidchicken.com>
	Fri, 8 Apr 2011 18:53:26 +0000 (14:53 -0400)
committer	Chong Yidong <cyd@stupidchicken.com>
	Fri, 8 Apr 2011 18:53:26 +0000 (14:53 -0400)
commit	86a3d6f51d7925d6fd4d833226a0efab5aa2a7d5
tree	73284bee3cb4d56c777645d8dccca67dbecdc57f	tree \| snapshot
parent	1ddd7d9ae2941315f3643ae0998663b82d991b02	commit \| diff
parent	14edc1654f139d1bcef9f8bf41676d9842966446	commit \| diff

Merge changes from emacs-23 branch

12 files changed:

doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/emacs/display.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/buffers.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/minibuf.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/positions.texi	diff1 \|	diff2 \|	blob \| history
etc/NEWS.23	diff1 \|	\|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/vc/vc-annotate.el	diff1 \|	\|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/term.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.